From: Neil Kandalgaonkar Date: Thu, 10 Mar 2011 00:14:36 +0000 (+0000) Subject: fixed some parseInts to have a base, renamed a var from number -> num since number... X-Git-Tag: 1.31.0-rc.0~31535 X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=70c354feb0e9a1dad8c9ed39720c3de4514b05f2;p=lhc%2Fweb%2Fwiklou.git fixed some parseInts to have a base, renamed a var from number -> num since number is reserved --- diff --git a/resources/mediawiki.language/mediawiki.language.js b/resources/mediawiki.language/mediawiki.language.js index f199101be1..fd30463dc3 100644 --- a/resources/mediawiki.language/mediawiki.language.js +++ b/resources/mediawiki.language/mediawiki.language.js @@ -28,7 +28,7 @@ mw.language = { // Restore the count into a Number ( if it got converted earlier ) var count = mw.language.convertNumber( template.title, true ); // Do convertPlural call - return mw.language.convertPlural( parseInt( count ), template.parameters ); + return mw.language.convertPlural( parseInt( count, 10 ), template.parameters ); } // Could not process plural return first form or nothing if ( template.parameters[0] ) { @@ -47,7 +47,7 @@ mw.language = { if ( !forms || forms.length == 0 ) { return ''; } - return ( parseInt( count ) == 1 ) ? forms[0] : forms[1]; + return ( parseInt( count, 10 ) == 1 ) ? forms[0] : forms[1]; }, /** * Pads an array to a specific length by copying the last one element. @@ -68,16 +68,16 @@ mw.language = { * @param {number} number Value to be converted * @param {boolean} integer Convert the return value to an integer */ - 'convertNumber': function( number, integer ) { + 'convertNumber': function( num, integer ) { if ( !mw.language.digitTransformTable ) { - return number; + return num; } // Set the target Transform table: var transformTable = mw.language.digitTransformTable; // Check if the "restore" to Latin number flag is set: if ( integer ) { - if ( parseInt( number ) == number ) { - return number; + if ( parseInt( num, 10 ) == num ) { + return num; } var tmp = []; for ( var i in transformTable ) { @@ -85,7 +85,7 @@ mw.language = { } transformTable = tmp; } - var numberString = '' + number; + var numberString = '' + num; var convertedNumber = ''; for ( var i = 0; i < numberString.length; i++ ) { if ( transformTable[ numberString[i] ] ) { @@ -99,4 +99,4 @@ mw.language = { // Digit Transform Table, populated by language classes where applicable 'digitTransformTable': null }; -} )( jQuery, mediaWiki ); \ No newline at end of file +} )( jQuery, mediaWiki );